[IA64] BUG() bad path during domain destruction

BUG out on badness due to SMP problems accessing the p2m table.  This
is temporary until we have a real fix.  To avoid this, do not use the
RX copy option (xennet.rx_copy).

Based on patch by: Tsunehisa Doi

Signed-off-by: Alex Williamson <alex.williamson@hp.com>

diff --git a/xen/arch/ia64/xen/mm.c b/xen/arch/ia64/xen/mm.c
index eed8a40be3849b227493497395791bf2fa53198a..27f66bf7f3f776d4fadda2a35807453d069eb7b4 100644 (file)
--- a/xen/arch/ia64/xen/mm.c
+++ b/xen/arch/ia64/xen/mm.c
@@ -399,11 +399,11 @@ gmfn_to_mfn_foreign(struct domain *d, unsigned long gpfn)
        unsigned long pte;
 
        // This function may be called from __gnttab_copy()
-       // during destruction of VT-i domain with PV-on-HVM driver.
+       // during domain destruction with VNIF copy receiver.
        // ** FIXME: This is not SMP-safe yet about p2m table. **
        if (unlikely(d->arch.mm.pgd == NULL)) {
-               if (VMX_DOMAIN(d->vcpu[0]))
-                       return INVALID_MFN;
+               BUG();
+               return INVALID_MFN;
        }
        pte = lookup_domain_mpa(d,gpfn << PAGE_SHIFT, NULL);
        if (!pte) {